Revert python back to bucket_type, fix a couple python examples