Some small changes before merging