More make fixes