NOREF: Still patching up a couple things from the old ways