[misc] Fixed build problems