autorecord fixes from hyn
merged