Some non-graphics build fixes