Fixes for AK/XC

Bock, Andy requested to merge Bock into master May 07, 2021