Minor updates/fixes/improvements