Label as v6.4.5 + whitespace fixes