Various clean and fix targeting issue #32

It fixes #32.