Fix compile issues with GCC.

Also auto-fixed some empty space, apparently.