A few more small updates