Some more changes for #19