Fix things following from comments from Marco and Sabih.