Platform changes from 6.x

Miscellaneous