Fixes/0.26

Update fork to main fixes/0.26