Adding some minor fixes