Minor cleanups. Removed many warnings.