Made the final set of fixes for the TN demo.