Fix bugs/unintentional changes from reviewing changeset