Further bugfixes