1. Various changes