Minor updates to fix a couple bugs.