more recovery from bws build customizations