Wintersmith 2.0 compat