More minor fixes

Same as last commit