Changes after review #265