MOCI 310 - Branch to fix compilation and running when using rigorous optimisation level compiler option.