Some fixes have been applied.