clock fixes - residue from 1.8 -> 1.9 ruby upgrade