ThKr: changes from build efforts...