Fix make errors