Clean up forwards and fix bad makefile command.