Fix variation saving and notices