minor bugfixes 3