build fixes for GHC 7.3