A couple of bugs