More fixes, suggested by R and L.