Minor changes to ensure table can be easily replicated