Fix some post tiny building bugs.