Fixes for bs4