Fix two issues.