2.8 platform independence

Compiles cleanly