Small fixes
Merge