Changes after fixes