Minor updates/fixes