Making things a bit more cross platform