minor bugfixes due to local problem (accidentally removed a couple of commits)