Small patch and helppatch fixes