Fix errors
Add byproducts to locations