Minor fixes
More tweaks