Change two types
Update some make rules