Miscellaneous e10s fixes