More minor improvements
Fix merge