Minor fixes, added retry transition