Necessary changes to get nemsis report 5 valid