Fixing warnings (patch by Alfred E. Heggestad)