Clock hotfix and images optimization