Add some minor fixes that haven't made it yet