fixes & patch file