Fixes for pricing and communication