Minor services changes