M28 misc fixes

# Warning
# Info
# Issues
Fixes #926 
Fixes #1138 
Fixes #1079 
For heap reasons.