fixes for Emer