Just some minor fixes