Import directory bugs squashed and PE fixups