build error fix and small fixes