As for the CLKBUF, I experienced some difficulties due to the same issue.
In the ms libraries, the inverters and buffers are balanced and can be used as CLKINV / CLKBUF.
In hs, they are not balanced.
That is a failing on my part.
Easy solution is to add in the ms inverters. That's inconvenient.
Will fix.