E balance bug fixes