Few small tweaks and fixes