Various Platform fixes