Fixed some issues with BaseService methods.