Fixes so that jim can run EEM standalone :]