Patches

A few minor patches to fix file imports