Draft: prevented possible deletion of draft wire during edit - fixes #1680
Little fixes to allow pycxx to compile with python3