Transition fixes, and row fixes