fixed build bugs in master