Update Composer dependencies

and some fixes