Updates for bug fixes in 1.29