minor fixes for fetch/push flexibility