Assorted ISIS enhancements from Hannes Gredler.