Fix platform detection?