bugfixes for marvin services