Other build fixes