diet build fixes