fix errors introduced by new clock