A couple more small changes