Fix warnings, small cleanup.