Fixes for multi-part keys