bugfixes to make installer work