Composer update and small CS fixes.