Minor improvements to tables