F/composer fixes

Don't merge this yet; I just want to get more eyes on it.