fixing pre-4.0 builds / tuple references