Fixes to upload to Hackage