Fix all the (minor) things