Hopefully this fixes some GCC 4.0 issues