Fixes for object target dependencies