Minor fixes
Fixes