Make GCC happy again