Fix issues
Merge