Fixed some more issues where platform information was not being correctly used on resuming.