One more attempt at clock fix (and some freeing of bytes)