Some new changes in accordance with GCC