Minor updates 2