more bugfixing for bs3