Fix wx compile from source, and other cleanup