Fixes for wx 3.0