Recover some bugs