Code fixes for nvhpcsdk

Merged Tobias Melson requested to merge nvhpcsdk_fixes into master_pre_stage

Merge request reports