Native ltc fixes and cleanup