Fix imports
Fix build on GHC 6.12