-Small fixes
-Adjustments for WX2.8.X