Fixing errors
Merge issues