2 minor bugfixes