Fix Makefile for bins. Do some cleanup.