Fixes problems with the return date in the MCP and ACP (Feature #86)