Fix build errors, now we can build