Table fixes for GFM. <Sam>