Pulled the latest platform and minor fixes