A few smaller changes