Fixed niggles.