Last-minute hotfixes