config, include fixes