More 1796 issues fixed