bug fixes for bucketized resources