1/11 - a couple minor changes