model: fixes for future value passing