Fix Bugs

William