Fix problems with C compiler and MS C-compiler