add more fixes for ago