Minor fixes for composer