3.31 Milestone 1: Bug Fixes