more transition fixes