resolving build errors; small fixes