Minor fixes

some minor fixes