bugfix: source-level fixes from Hungpu DU in #25; there were no real harms though.