Misc EFF changes