Shuffled dependency settings around