Other patches

Up