partial fixes to cmake deps