Minor updates for includes and config