More bugfixes to test Composer package.