Make fixbugs pass