Some more fixes for hard dependencies