Fixes and BD updates