Add some minor changes