Fixed wxpython upgrade incompatabilities.