More tweaking for deployment...