Fixes with Michael -- Sunday 12/8