Fixed problems with gcc