Platform-files fixes