Various small misc. changes.