Minor fixes
minor bugfixes