Just some minor changes