Couple tweaks for help w/ autotesting & null pointer fixes