Small final changes