Multiple fixes including a workaround to get patched Monkey working