minor bugfixes 6