Bugfixes (not finished)