Minor modififications