First commit
Merge fixes