GCC 4.8 cleanup.

Error and warning cleanup for GCC 4.8.