Fixes/0.26

merge fixes