minor bugfixes for git issues #157 #158 #159