More anchor fixes