Fixing IoC issues