.Make updates and fixes.