Minor changes. Compilation warnings.