More deltaclock bug fixes