Fixed up a few mixed uses og spaces and tabs to be friendly to the future