Bugfixes everywhere