minor bugfixes 5