Minor changes for Fire E