Minor warnings solved.