Access Key: Bug fixes and tweaks.

Bug fixes and tweaks.