Fixes in extras + clock.mrc