MVE: Code changes to prevent warnings with nvcc