Singlethreaded - Bugfixes