Fix for #4293

Signed-off-by: Mloc <colmohici@gmail.com>
Fix for #4194

Signed-off-by: Mloc <colmohici@gmail.com>
Merge pull request #4294 from Mloc/bs12-fixes

Fixes