Platform and 2.5D fixes

Pull request to correct branch this time.