More bugfixes! Whooooooooo