Some fixes for dependencies