Bugfixes (preparations for LD30)