Some table fixes for 871 preseentation