Fix make and compile