Minor fixes
Couple tweaks