fixes for non-GHC