more patches

#775, #783