Further bugfixes again