Minor updates/improvements