Various minor modifications.