Fix some hard coded table