make fixes