couple more tweaks to the way locktime vars are passed around