Some snippets and some small config changes