BG/Q fixes