Fix some reported issues.