Minor fixes
More minor fixes