[WIP] Fixes