Bugfixes (5 fixed)