A few more small changes