Fix various dependencies