A few other small updates