Adding some minor changes