John Sullivan's patches plus more fixes: