Minor changes to account for table rendering