Changes to be GCC3.1 friendly