Initial fixes
Merge