Closing several issues for the 1.1 Milestone