Try to make compatible with 24.4
Add ergoemacs fixes for 24.4