willcrichton Fix module and record_to_vars issues