[Git][ghc/ghc][wip/amg/castz] Minor fixes