more fixes for dealing with failed builds