Fixed small bugs BuildController