Alexwashere

A couple of small fixes from Alex's visit