Fixed build errors for GHC 7.6.3 and current modules