Miscellaneous e10s fixes

Done.