Fixes in isolation wrapper

last bugs I have found. Each single step and whole chain have been tested in modelsim and serenity. Was not able to build for apollo out of the box, looks like apollo not fully integrated into emp.