Fixes

Small fixes not including elevation features.
> What about changing the assert by a warning message?

Yes, a warning makes sense.