More short tag fixes