Fixed some weird dependency issues. Not sure why that started happening,
but it seems ok now.