ML: Refmaxwell Fixes

Created by: csiefer2

PLEASE DO NOT MERGE.

I need to check another app first. I just want to get the autotester baking...