A couple of fixes: