Sample fixup
Fix for BRA issues (various)