Minor fixes after inspections of warnings