Few tweaks to be a bit more resiliant on database blockages. Root cause of blockages are not known yet.