Digital download shipping issues

I have come across 2 issues relating to digital products.

1) A shop has set a shipping fee in the Shipping Section of the Store Settings. This fee is being applied to both physical and digital products. Should the system pick up that a product is digital and not charge shipping fees? We're using the Flat Rate International Plugin for setting the shipping.

2) If a physical item with shipping is added to the basket, and also a digital item without shipping, If you remove the physical item, the basket still tries to charge shipping.

There's a couple of other threads on here that mention these issues but no solutions.

Using the latest version of Marketpress, Wordpress.