Minor syntax change.
Various fixes.