small bug-fixes