minor bugfixes 8