Initclock now directly called from startup.
Merge branch 'Initclock-fix'