Minor fixes. Save functionality.