Fixed various dependencies to remove conflicts