Patch some issues