Fix GCC issues.
Oops, fix bugs.