Patch to fix some clock issues