fix: more pch handling fixes