minor bugfixes 4