Fixes for EG