2 minor bugfixes solved