Fixed some stuff in new service interfaces