gcc_struct warnings fix #1