Fixes for deps