tweaks to remove error messages