Added new patch with fixes