Fixed some simple dependencies to outdated objects
10 files changed