Fixed up some potential build/organization issues