Slight tweaks to SR rebuilding logic and logging