More stream position fixes!