fixes and retry support