Minor tweaks & Fixes