Fix pch
Merge & fix pch build