Change some minor stuff in analysis tools