Fixed Avg issues