fixes for newer packages