Fix problems with platform retrieval.