Few tweaks and fixes.