More os support

fixes #32