Changes to 1.3.5b2 build