Make dependencies work right