Fix more typos and build