i965g: fixes to build after merge of master