BlueGene fixes