Fix AndPImm instnace in lithium
Fix remaining AndPImm issues in lithium