Resolve remaining issues except for @hash build targtes that depend on other build targets