Moarrr fixes for tag changing problem