Fixup hash behaviour on page load
Add make watch