Fixes

Small fixes not including elevation features.
This seems orthogonal to elevation. Should be untangled then.