More dummy fixes