Fix misc issues.