minor bugfixes in fake production environment