build config and fixes