minor makefile fixes to get all the packages, CMD check seemed to have changed slightly