Fix issues with platform proxy