Minor fixes
Merge remote