Added fixes
Another fixes
Merged fixes