minor bug fixes
minor bugfixes