Minor refactorings only - removed underscore shim
Minor modifications
Fixes for Release build
Fixes for running optimised scripts