Adding fixes from first round of questions