Fixing problems with the waypoint Editor

Fixing problems presented in issue #294.