Some issues fixed in adapter (errors starting/stopping services)