Bug fixes for customer access keys