Fix some crashes and table displaying