See #161: Various fixes for the keys distringuishing between Long and String id.