Fix Clock driver bug, and prepare for submission upstream