Fix location of persistence annotations