fixes in patch