Fixes in our build targets