Bug Fixes for Milestone1