Few tweaks getting things setup