Minor fixes
Merge fix