Minors fixes & upgrades