Add some minor fixes