Fixes to CPFs for proper lang layer usage