Tweak messages
Support non-Haskell libraries