Use external platform and minor fixes