Fix some outlined issues.