Fixes for compilers with -fno-common