A few minor updates/bug fixes.