more fixes required to keep up with later-beamer updates