Minor code and conf comments fixes