Various changes, previous commit may have failed.