Fixing errors and omissions