[BUILD] Fix build issues