more tweaks to facilitate error robstness