Some vital fixes to fatal glitches before the 1.5 submission