Made partial OS-specific changes