Resolved two warnings