Minor updates, bug fixes.