Few tweaks and fixes (ISOT)