Catch a few more possible inputs to AmazonBucket correctly.