Moved from MS compiler to GCC