Couple more changes re: last commit