MAESTRO-2969 spec fixes