More fixes to times when associating keys