Fix some dependencies to not fail on bean creation