Fixed access keys problems