minor bug-fixes