Other wx port fixes needed to restore the build bot.