Clean up a handful of build warnings.