FL-663: corrected patches