Fixed GCC warnings. Cleanup.