Fix non-explicit dependencies