Fixed somw warnings