Improve - check compile

Also any feedback is welcome.

Also poke @rsa - you said something about non-iso before - what exactly were you refering to?