Fixes for dependencies and the lot. :)