Fix OS override option to work against new OS detection code.