Fixed fee calculator small bug

Some minor fixes