Fixes by Juan for 1978