Added some support for lcsh vs lcnaf