Fixes for rules-haskell