Put some more fixes to this sicne the patch is generated with older file