Cleaned up native platform detection for when platform cannot be detected from properties
Minor cleanups fior platform