minor bugfixes 7