Changes fixes