Fixed issues with gcc