aap small streaming fixes