- Fix build problems