Fixed compilation issues after move.