more lattice fixes