CA-128503

Assorted fixes.