Fix some bugs because of sleepy brain