Bug fixes in beams.