Solve minor building errors and warnings