Minor fixes after Danny's email