additional wx2.9 fixes