Changes some bugs