Fixed (hopefully) dependencies finally.