Fix non-compilation problems.