Fixing components, features, service stubs issues