[Review] Bug fix and build update