NBF0: load/save fixes

load/save fixes