Fixes on hash navigation