Minors changes to things