Small changes
Made some changes, so now it compiles under GCC