Fix some more depend issues
20 files changed