fixes for async fetch