Fix build and config