Some Emma fixes

Pushing before I go to work, only a few emma errors left, I think Mitch
would be best to solve them considering its his code, very low amount of
work left