Other patches JTG

Up