Bugfixes, whoo