Fix fork repo and macaron API broken