Make some minor changes