Fixes for pull to refresh