Fixes

WIP