Minor fixes

minor fixes