FIX: Better wx support