Minor fixes
minor fixes