tweaks to get simulator compiling