small fixes
adapt to redesigned build system