* Fixed up some stuff ups from committing failure.