Fix leftover issues.