Few attribute corrections based on 'Base services' documentation