change special keywords, fix build