added some potential fixes for E issues