Minor code changes - trying to get OAuth to work