Additional services bugfixing