Some minor changes before merging