Bugfixes and derps