oops, I forgot to commit these tweaks;