A couple of fixes has been added.