A couple of small fixes and additions