Minor changes to support Graywulf integration.