Small fixes
Merged differences
Merged differences