two additional issues fixed