fix compilation issues with new combinercontext