Few tweaks and fixes