Further changes to correct minor errors