SK-4609: Fixes and updates.