Fixes on fees