Minor updates after running script myself