@dogphish: Small updates