Some wrnings fixed