Code cleanup for GCC