Rate Calculation and Validation Fixes.