Updates missing from previous commit