More transition fixes