Cross platform fix
Merge branch 'rio-5.0-M4' of https://github.com/dreedyman/Rio into rio-5.0-M4