More fixes for platform 3