Fixes for dependencies