LAC-28: Fixing bugs with setting dependencies