Fix flakey customizations