fixes for picky C compilers