Fixes for composer