Fixes to prevent forever from giving up on a deployed site
Playing with overriding options