Adapt to formatter and io changes
Fix up Makefile