minor bugfixs