Minor improvements after passing ag-ups through Sonar