More tweaks & fixes