various bucket to time fixes