Fix some make paths
Use a better top level production