Merged in some forgotten changes

Really? Really, brain?