Apply VMscan patch and fix stuff