Fix build problems