Fixing more href bugs