Various fixes/changes.