Merge "Fix a few issues with procstats associations:"