A few updates given recent changes