Minor modifications and some deps updated