Some fixes for fetch