Minor updates to entropy calculations.