more anchor fixes