Merged in some forgotten changes