Small changes on tables again