Small make fixes