More Composer set-up (and a slight fix for importing dates).