#46: Removed a bunch of warnings.