add few patches

Based on Omni - for me importand ;)