Just to get minor updates added to the temp branch