Somewhat quick/rushed updates for BS3 compatibility.