Fix up fee warnings some more as agreed with Michael