More stuff for #95