Implement corrections requested by Sylvain.