Fix bugs from bugfixes(lol)