minor bugfixes 2