Bugfixes! Bugfixes everywhere!