Fix minor issue with how resource keys are created