Fix bugs :)