Fix some short tags