Some logging and config fixes