FL-1295: add missing patches, cleanup. Confimed working on pure64