[0.99] Fix Bugs