More tiny fixes
More minor fixes