Updates for Shelter build 1.25.