Minor changes to merge in MOST_ND to this repo