Re: amstream: Some fixes