Some fixes on the left/right repeating