Minor changes and fixes when tables become empty.