Made some hacks to fix issues with ephs instruction set