Minor updates and fixes.