Tidied up imports based on GHC warnings