Fix composer.json and sync composer.lock