Adding fixes from Mike's feedback