Some more changes that should have been in the last commit