Minor iprovements