More minor changes
Reset after botched merge