fixes for new platform