[FIX] Fixes after WIP