Remaining fixes to get encoder working again.