House keeping II, warning messages taken care of.