Small changes and config