Hash tag fixes