Feature/m26 misc fixes

# Warning
# Notes
# Issues
Fixes #1070 
Fixes #1071 
Fixes part of #968