Fix some bugs :troll: