Fixed build errors for CF.