Bugfixes. Bugfixes everywhere.