Little changes before merging