patches from piratefeedback 1.1.2