Patch fixes