Minor cleanup, some compiler warings resolved.