Fix a couple more crashes with incorrect KDMs (#1000).