Some more misc. changes.