LTV crash fixes, crashes encountered with newly introduced changes