Allow for enforcing a bucket prefix and cleanup some logging