Bugfixes (possibly)