Some lack of pch fixes.