FIX: Fix raw
WIP: Fixes