More minor fixes
More minor fixes