Small updates to aid integration and analysis