Small adjustments to get watches working.