data anchor fixes