Fix build issues after libs move