Pre-Elytron fixups