updated to support lib 21 and fixed a build error.