[PD-dev] key/keyname fixes for macOS