Fix simulator issues for LNR and LLC/LLGC