Various watch tweaks.