fixes for new pelican