Composer Fixes

Some composer fixes here.