More fixes to examples and config