FIxed warnings