Some tweaks & fixes