Fix all build problems