A couple of simple fixes