Add report types to NSF and fix TypeError.