Fixes

Small fixes not including elevation features.
Yes, there are tests in elevation.feature both whether elevation is
compiled in or not.