More no-graphics build fixes