Merge fixes: stats working