More variation fixes