Fixes after WIP