Use R16 friendly deps