A couple of fixes for the previous addition.