bug fixes for bismark