Bugfixes for a working executable