Add formatting and fix case of runtime distributions.