Applied patches from SciDAVis