Minor updates, fixes.