some fixes for nvidia and intel compilers