Add back and improve waiting for journal plus few other performance helpers