transition fixes